Use AccountPtr in serverVersionChanged signal instead of raw pointer

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 53c85e4b2137051bf1c9c2813669d9a37a730569..ecaca4fb37a1b09463ad95a6a110fdad809fe6b9 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -655,7 +655,7 @@ void Application::slotAccountStateAdded(AccountState *accountState)
     connect(accountState->account().data(), &Account::serverVersionChanged,
         _folderManager.data(), &FolderMan::slotServerVersionChanged);
 
-    _gui->slotTrayMessageIfServerUnsupported(accountState->account().data());
+    _gui->slotTrayMessageIfServerUnsupported(accountState->account());
 }
 
 void Application::slotCleanup()

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 5ee0737e2eebd3311b1d7f1ce4ee63696709da81..4abfe8458599ecc9b2122dfa1cc1aeed7f6c7306 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1107,7 +1107,7 @@ void FolderMan::slotForwardFolderSyncStateChange()
     }
 }
 
-void FolderMan::slotServerVersionChanged(Account *account)
+void FolderMan::slotServerVersionChanged(const OCC::AccountPtr &account)
 {
     // Pause folders if the server version is unsupported
     if (account->serverVersionUnsupported()) {

diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 4c33005bb81c2864fed2d684ad867940354dc28f..a1fdf81b74c143f6957946d3d49e7e0b4349f5f0 100644 (file)
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -317,7 +317,7 @@ private slots:
     // FolderMan::folderSyncStateChange(Folder*) signal.
     void slotForwardFolderSyncStateChange();
 
-    void slotServerVersionChanged(OCC::Account *account);
+    void slotServerVersionChanged(const OCC::AccountPtr &account);
 
     /**
      * A file whose locks were being monitored has become unlocked.

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 5f5478260ea28e3ea62cd24bff0a3b4f86c78d60..e387275968cad0d5f88a0adc249cf7167fd9212f 100644 (file)
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -264,7 +264,7 @@ void ownCloudGui::slotOpenPath(const QString &path)
     showInFileManager(path);
 }
 
-void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
+void ownCloudGui::slotTrayMessageIfServerUnsupported(const AccountPtr &account)
 {
     if (account->serverVersionUnsupported()) {
         slotShowTrayMessage(
@@ -276,8 +276,8 @@ void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
     }
 }
 
-void ownCloudGui::slotNeedToAcceptTermsOfService(OCC::AccountPtr account,
-                                                 AccountState::State state)
+void ownCloudGui::slotNeedToAcceptTermsOfService(const OCC::AccountPtr &account,
+                                                 const OCC::AccountState::State state)
 {
     if (state == AccountState::NeedToSignTermsOfService) {
         slotShowTrayMessage(

diff --git a/src/gui/owncloudgui.h b/src/gui/owncloudgui.h
index 446b58a9c19bed2933277632292fd9a9d100e8d7..d02d7d12402dfdcb20a8144c8e8d7faf3651735c 100644 (file)
--- a/src/gui/owncloudgui.h
+++ b/src/gui/owncloudgui.h
@@ -91,8 +91,8 @@ public slots:
     void slotSettingsDialogActivated();
     void slotHelp();
     void slotOpenPath(const QString &path);
-    void slotTrayMessageIfServerUnsupported(OCC::Account *account);
-    void slotNeedToAcceptTermsOfService(OCC::AccountPtr account,
+    void slotTrayMessageIfServerUnsupported(const OCC::AccountPtr &account);
+    void slotNeedToAcceptTermsOfService(const OCC::AccountPtr &account,
                                         OCC::AccountState::State state);
 
     /**

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index e01fdbe0e528e0ee13782e2c0e295eb79c9b64b4..bb0a0e117b8030f848722fd59798fe7be5d3820a 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -809,7 +809,7 @@ void Account::setServerVersion(const QString &version)
 
     auto oldServerVersion = _serverVersion;
     _serverVersion = version;
-    emit serverVersionChanged(this, oldServerVersion, version);
+    emit serverVersionChanged(sharedFromThis(), oldServerVersion, version);
 }
 
 void Account::writeAppPasswordOnce(QString appPassword){

diff --git a/src/libsync/account.h b/src/libsync/account.h
index 19c0a1124d62b48b3c2dd7df2bc3d1098f80675a..041144387d4541a00798bfdc9783adf0b5739da6 100644 (file)
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -448,7 +448,7 @@ signals:
 
     void wantsFoldersSynced();
 
-    void serverVersionChanged(OCC::Account *account, const QString &newVersion, const QString &oldVersion);
+    void serverVersionChanged(const AccountPtr &account, const QString &newVersion, const QString &oldVersion);
 
     void accountChangedAvatar();
     void accountChangedDisplayName();